gdbsx: Makefiles: correctly generate dependencies

gdbsx hacks CFLAGS to remove optimisations for easier debugging, however
this breaks dep generation due to an early evaluation of CFLAGS and
leaves stale files called "..d" after a make clean. We could possibly
fix this by separating dep generation from the rest of CFLAGS but it
seems a little invasive. The gdbsx hackers can do their own thing during
development and testing anyway...

Signed-off-by: Gianni Tedesco <gianni.tedesco@citrix.com>

diff --git a/tools/debugger/gdbsx/Rules.mk b/tools/debugger/gdbsx/Rules.mk
index d729323cb524b1a99b5fa1e0f5e6c8cd8385598d..6e38f2df995c3ed2e3bb77dc740a43989e114e7c 100644 (file)
--- a/tools/debugger/gdbsx/Rules.mk
+++ b/tools/debugger/gdbsx/Rules.mk
@@ -2,8 +2,3 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -Werror -Wmissing-prototypes 
 # (gcc 4.3x and later)   -Wconversion -Wno-sign-conversion
-
-# just in case have to debug gdbsx, keep life simple.
-TMPFLAGS := $(CFLAGS)
-CFLAGS := $(filter-out -O% -DNDEBUG -fomit-frame-pointer, $(TMPFLAGS))
-CFLAGS += -O0

diff --git a/tools/debugger/gdbsx/gx/Makefile b/tools/debugger/gdbsx/gx/Makefile
index c9a48c0ccfdc2a244b47d23266ded2965680c165..6dd8bf1ec5795e0bde28a9e459dcf158f4044a00 100644 (file)
--- a/tools/debugger/gdbsx/gx/Makefile
+++ b/tools/debugger/gdbsx/gx/Makefile
@@ -9,7 +9,7 @@ all: gx_all.a
 
 .PHONY: clean
 clean:
-       rm -rf gx_all.a *.o 
+       rm -rf gx_all.a *.o .*.d
 
 
 #%.o: %.c $(GX_HDRS) Makefile

diff --git a/tools/debugger/gdbsx/xg/Makefile b/tools/debugger/gdbsx/xg/Makefile
index 4ea695987ed861a3ba9be7eebd615d5a2c417369..c3e6185d94dea960ef43e6d5b02b1b619dff38bb 100644 (file)
--- a/tools/debugger/gdbsx/xg/Makefile
+++ b/tools/debugger/gdbsx/xg/Makefile
@@ -32,5 +32,5 @@ xen-headers:
 
 .PHONY: clean
 clean:
-       rm -rf xen xg_all.a $(XG_OBJS) 
+       rm -rf xen xg_all.a $(XG_OBJS)  .*.d